Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Mon, 3 Sep 2012 19:22:12 +0000 (21:22 +0200)
committerWolfgang Denk <[email protected]>
Mon, 3 Sep 2012 19:22:12 +0000 (21:22 +0200)
* 'master' of git://git.denx.de/u-boot-cfi-flash:
  cfi: Make the flash erase and write operations abortable
  cfi: Check for blank before erase

Signed-off-by: Wolfgang Denk <[email protected]>

Trivial merge